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