Merge changes from topic "am-2b845371bfb24cbda58a356f9712fc87" into main

* changes:
  Merge changes from topic "am-233042b8d4194015b3e2cf0f69bfda1b" into android14-tests-dev am: 4f0f22ed65
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." into android13-tests-dev am: 8fc262ab36 -s ours am: 1513cac5ae -s ours