tree 63711e012efe8a7e40cc0846a127bfcbebd777b8
parent fd26d73e51e3642f55f071a3609d38b9e438096c
parent b0d7e2a8d8e8fffd4ab0903c4f4329d8552ff309
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648851197 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1648851197 +0000

Merge changes from topic "am-899efca61326421e944f0caa4dd3086d" into android12-tests-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE: cts: Re-launch the desired activity after screen-on on TVs." into android11-tests-dev am: d49586896c -s ours
  [automerger skipped] DO NOT MERGE: cts: Re-launch the desired activity after screen-on on TVs. am: d6c5b1f037 -s ours