Merge "Merge "Fix NullPointerException in PIA when installing from Files app"...

Merge "Merge "Fix NullPointerException in PIA when installing from Files app" into udc-dev am: 94e474ca am: a74e5a38 am: 97fe08bc" into udc-qpr-dev-plus-aosp am: 4d6a5dff

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



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