Merge changes from topic "am-43b4283abaf141c7ad054d3d2f41c002" into android14-tests-dev

* changes:
  [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b -s ours
  [automerger skipped] Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 68a4dda683 -s ours