Merge "Addresses TODO in ResumeOnRebootService Javadoc" am: f58b4a1109 am: 894b984747

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

Change-Id: I0cedbd8d0a5028af4f34c78628a6156f4327fe6d