Merge "Addresses TODO in ResumeOnRebootService Javadoc" am: f58b4a1109

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

Change-Id: I56f15a90d5c136873e29d733d3f57d89a498bdcb