Merge "Revert^2 "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to...

Merge "Revert^2 "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 0da6802b

Original change: https://android-review.googlesource.com/c/platform/build/+/3364093



Change-Id: I1884e64158d08d3952f906801fb4df755be48930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>