Merge changes from topic "am-37c26a8379d04455a15442c9ec31025b" into android12-tests-dev

* changes:
  Merge "[automerger skipped] Merge "simpleperf: force testing run-as and app_runner separately." into android10-tests-dev am: 1b0881c929 -s ours" into android11-tests-dev am: f06215ef50
  [automerger skipped] Merge "simpleperf: force testing run-as and app_runner separately." into android10-tests-dev am: 1b0881c929 -s ours am: 966e25f6dd -s ours