Merge changes from topic "am-128b70ede4834fcbb8e184aeedb7ca94" into android14-tests-dev

* changes:
  [automerger skipped] Merge "Revert^2 "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 0da6802bab -s ours
  [automerger skipped] Revert^2 "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 8b0499bb9a -s ours