Merge "[automerger skipped] Merge "simpleperf: replace InCloudAndroid() with runtime check." into android11-tests-dev am: c039b5cf02 -s ours" into android12-tests-dev am: 74954de15a

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

Change-Id: Ifce085da936be76bdbb8dccb697ff6397922bc4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>