Merge "[automerger skipped] Merge "Merge "Add new owner to the...

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