[automerger skipped] Prevent exceptions in pre-reboot verification from crashing system server am: fdf525f5 am: f9f22b63 -s ours

am skip reason: Change-Id If100796687906be67bc02ea63a78e1b6e291ce7a with SHA-1 b560b645 is in history

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

Change-Id: I2edd6e27070ba38eb1fed19191a0f655a20a00eb