Merge changes from topic "am-fb790266f0ca48b5af08dee2f165fe58" into android14-tests-dev

* changes:
  [automerger skipped] Merge "[RESTRICT AUTOMERGE] Enable build MCTS on aosp-android13" into android13-tests-dev am: 41f7dbd101 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Enable build MCTS on aosp-android13 am: 6468f44329 -s ours