[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: 43ea79ba -s ours am: 5d61f3be -s ours am: edddb930 -s ours am: 9607ae0a -s ours

am skip reason: contains skip directive

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



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