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

am skip reason: skipped by user yabinc

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

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