[automerger skipped] Prevent exceptions during staged install from crashing system server am: ed2cd670ec am: 580b492671 -s ours

am skip reason: Change-Id I9abec5d2401af95ecb095fa3c45960d2f15d4e74 with SHA-1 7a5bf6ccd8 is in history

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

Change-Id: Icc03c8241d0151b666ea85b408d7a519c642d923