Merge "Revert "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 1b7445982b

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

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