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

[automerger skipped] Revert^2 "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS." am: 8b0499bb am: 57eedae5 am: 6be3bc11 -s ours

am skip reason: contains skip directive

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



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