[automerger skipped] Merge "Revert^2 "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 0da6802bab am: 019afc6e3b am: c594177386 am: 95ef4f0717 -s ours

am skip reason: contains skip directive

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

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