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

* changes:
  Merge "[automerger skipped] Merge "simpleperf: Omit dwarf-callgraph tests running on ARM binary translation" into android10-tests-dev am: 5bb741cc8c -s ours" into android11-tests-dev am: 3d2a53da83
  [automerger skipped] Merge "simpleperf: Omit dwarf-callgraph tests running on ARM binary translation" into android10-tests-dev am: 5bb741cc8c -s ours am: cf35ee8cfb -s ours