Merge "Fix call to PackageManager exception" into udc-qpr-dev am: 7875db5f

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



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