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

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

Change-Id: I9aec5f760d011d9ab6cfe21d3eb2c2cce2c535d6