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

* changes:
  Merge "[automerger skipped] Merge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters." into android10-tests-dev am: aa57fd3ff3 -s ours" into android11-tests-dev am: ef1baf5351
  [automerger skipped] Merge "simpleperf:add MSM8909 into whitelist, omit tests requireing hw counters." into android10-tests-dev am: aa57fd3ff3 -s ours am: 6febe6dc28 -s ours