tree 9b51a196cf7e9d2498324b522f822fd163a159ae
parent a0f85ebf7512bd90c6da9689f068d65f832e55ea
parent 8ad97c0d63eed03ac54d5727bcbb14f95536e524
author Tianjie Xu <xunchang@google.com> 1614919562 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614919562 +0000

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