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 am: 019afc6e

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



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