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

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

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