[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: f2a519c7 -s ours

am skip reason: contains skip directive

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



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