[automerger skipped] Merge "Addresses TODO in ResumeOnRebootService Javadoc"...

[automerger skipped] Merge "Addresses TODO in ResumeOnRebootService Javadoc" am: f58b4a11 am: 894b9847 am: 9d515f3a -s ours am: b5cce57d -s ours

am skip reason: skip tag Change-Id I7669bbfc3975c164e773b9517dde5e3437b2fc1a with SHA-1 47b9ccdf is already in history

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

Change-Id: Ie6151c71b49e36104be767bfef7f8110adb42e71