[automerger skipped] Merge "Create the ResumeOnRebootService." am: edc79612...

[automerger skipped] Merge "Create the ResumeOnRebootService." am: edc79612 am: 12b77e5e am: d6496b0d -s ours am: bffbf4a6 -s ours

am skip reason: Change-Id I98378be6963194c2e6faef8ebc441066b75a0bbf with SHA-1 4ace4790 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I777723cfeabe41411941751c8c58d7cb2fb2ad0c