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: adb4e3e4 am: a167c544" into udc-qpr-dev-plus-aosp am: 9cb54854

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



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