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