Merge "Fixes all remaining potential NPEs related to pkg" into rvc-dev am: 9cd979a6f7 am: d5a0b76227

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

Change-Id: I2348bcc9f8618a27eda4c316cd09f411f7e503a5