Merge changes from topic "am-36eb97415e3d42bf94ee8b3737838024" into android10-tests-dev

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] CtsAtraceHostTestCases: Fix parser for newer kernels." into pie-cts-dev am: 4785e2a18c -s ours
  [automerger skipped] [DO NOT MERGE] CtsAtraceHostTestCases: Fix parser for newer kernels. am: 12eebc8312 -s ours