[automerger skipped] Merge "Revert^2 "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 0da6802b -s ours am: e7326df0 -s ours am: b1b6a801 -s ours am: 489f4df9 -s ours am: 48c9fcf0 -s ours

am skip reason: contains skip directive

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



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