Merge "Don't throw runtime exceptions in ResumeOnRebootServiceProvider"