Merge changes from topic "am-c54e5100772b4e8a9108d68cd03b73e3" into android11-tests-dev

* changes:
  Merge changes from topic "am-36eb97415e3d42bf94ee8b3737838024" into android10-tests-dev am: fa1cbe3d98
  [automerger skipped] Merge "[DO NOT MERGE] CtsAtraceHostTestCases: Fix parser for newer kernels." into pie-cts-dev am: 4785e2a18c -s ours am: 209d38ff28 -s ours