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

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

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