Merge changes from topic "am-3797f752724847688785f181e6dceaab" into main

* changes:
  Merge changes from topic "am-258f4bedd45345c3b5a7f530457db827" into android15-tests-dev am: b2113b08ef
  [automerger skipped] Merge "Revert^2 "RESTRICT AUTOMERGE: Package xTS console into CTS 13 to support MCTS."" into android13-tests-dev am: 0da6802bab -s ours am: e7326df03f -s ours am: 9455316dac -s ours