Merge changes from topic "am-14827b4d66ef48518c1351bf25da3e5d" into android12L-tests-dev

* changes:
  Merge changes from topic "am-aa896978f3f842889b19a8d53a927486" into android12-tests-dev am: 5c2df088f0
  [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 am: 9d58c9dc98 -s ours