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