Merge changes from topic "am-e0e87b4b84424ea8b3d8684d6a7c8b72" into android12L-tests-dev

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