[automerger skipped] Merge "Create the ResumeOnRebootService." am: edc7961287 am: 12b77e5e5b am: d6496b0d6b -s ours
am skip reason: Change-Id I98378be6963194c2e6faef8ebc441066b75a0bbf with SHA-1 4ace479070 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527798
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36f8fd2a0a4c181f658dbd01073de8b65440b735
This commit is contained in: