Merge changes from topic "am-91c071b418ae4b1cbee26c4f3dda81ef" into android13-tests-dev

* changes:
  Merge changes from topic "am-e0e87b4b84424ea8b3d8684d6a7c8b72" into android12L-tests-dev am: 04747534f8
  [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