Merge "Add new owner to the resume-on-reboot module." into android12-tests-dev