[automerger skipped] Merge "Addresses TODO in ResumeOnRebootService Javadoc" am: f58b4a1109 am: 894b984747 am: 9d515f3ad7 -s ours

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

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

Change-Id: I9f94f763f0cb5c5ed7d240d57faac16b3060503d