Merge changes from topic "am-039e403088cd4f18a656c3a5d89a8981"

* changes:
  [automerger skipped] Merge "Add new owner to the resume-on-reboot module." into android13-tests-dev am: 55ff2354 -s ours
  [automerger skipped] Add new owner to the resume-on-reboot module. am: 483f02cf -s ours