Merge "Revert "Add group ID for reading tracefs"" into android12-gsi