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

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1214104

Change-Id: I880e1ea0538a6ad41eea90f246cacc31208413b2