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 am: 67228d67 -s ours am: d60c9af9 -s ours

am skip reason: Merged-In I5af32f68652d5854e6a99b59f2f56fcaac575588 with SHA-1 8c8d787b is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2249398



Change-Id: I3ef1eb81fd56387962dfeb6c6a9d35e666e50fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>