Merge "Fix anr when installing package" am: 387cf5e127 am: cfe526b0a7

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

Change-Id: I252ffec7007faa2a96a1eafe8955a3d18f21c537