Merge changes from topic "am-c287c9cb63d845718e3905cd73c3726b"

* changes:
  Merge "[automerger skipped] Merge "Merge "Add new owner to the resume-on-reboot module." into android12-tests-dev am: 533e4e9b" into android12L-tests-dev am: ec91f356 -s ours" into android13-tests-dev am: 67228d67 -s ours
  [automerger skipped] Merge "Merge "Add new owner to the resume-on-reboot module." into android12-tests-dev am: 533e4e9b" into android12L-tests-dev am: ec91f356 -s ours am: fa4cb30d -s ours