[automerger skipped] Merge "Revert^2 "RESTRICT AUTOMERGE: Package xTS console...

[automerger skipped] Merge "Revert^2 "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 0da6802b am: 019afc6e am: c5941773 am: 95ef4f07 -s ours am: b84201bd -s ours

am skip reason: contains skip directive

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



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