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

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



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