Merge "Merge "Catch one more DeadObjectException." into udc-dev am: 459425f6 am: c81df6c8 am: badd2223" into udc-qpr-dev-plus-aosp am: ec69e383

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



Change-Id: I70e449b2392b4ba300c162fd90ad540cd6861e5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>