Merge "Fix anr when installing package" into rvc-qpr-dev am: 03a7e5c7 am: 2528d9ae

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

Change-Id: I642c7a2542a9400c98a3618d16df12931892322b