Merge changes from topic "am-510e537a7c34466d8ed3053298cfa958" into main

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 -s ours