Merge changes from topic "am-43ae75bafd3e4f78a4972106e2689147"

* changes:
  Merge changes from topic "am-91c071b418ae4b1cbee26c4f3dda81ef" into android13-tests-dev am: bac4d2b7a7
  [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: a7c7e52fcf -s ours