Merge changes from topic "am-aa896978f3f842889b19a8d53a927486" into android12-tests-dev

* changes:
  Merge changes from topic "am-c54e5100772b4e8a9108d68cd03b73e3" into android11-tests-dev am: d75590c551
  [automerger skipped] Merge "[DO NOT MERGE] CtsAtraceHostTestCases: Fix parser for newer kernels." into pie-cts-dev am: 4785e2a18c -s ours am: 209d38ff28 -s ours am: 6d39bd3f38 -s ours