Merge "Merge "Fixes all remaining potential NPEs related to pkg" into rvc-dev...

Merge "Merge "Fixes all remaining potential NPEs related to pkg" into rvc-dev am: 9cd979a6 am: d5a0b762 am: 3ca94f6a" into rvc-qpr-dev-plus-aosp am: a4f04762

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

Change-Id: I70049918746f4095ce7dbe182ec5d5d1065f6210