Merge "Don't throw runtime exceptions in ResumeOnRebootServiceProvider" am: 8ad97c0d63

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7977a64ae425335c5f54c98065b75ccfb12fe1f