Merge "Update Java doc for ResumeOnReboot" am: 90772648cd am: bb0da56b59 am: ce39bfb3c1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4094215da64288110a3be8919f0f19157418925