Merge changes from topic "am-fe5646e391f14a43a977056ad559439d" into android15-tests-dev

* changes:
  Merge changes from topic "am-fb790266f0ca48b5af08dee2f165fe58" into android14-tests-dev am: c231633071
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android13" into android13-tests-dev am: 41f7dbd101 -s ours am: e30f3daac7 -s ours