Merge "Add new owner to the resume-on-reboot module." am: ac46d9b1 am: 20fedd9d am: 53cdc22b

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



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