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

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

Change-Id: Idefdfcf44e1b5bd64f88d5be06f66a829b74c25a