Merge "Fixes all remaining potential NPEs related to pkg" into rvc-dev am: 9cd979a6 am: ae64aa5b am: dd04d129

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

Change-Id: Id5589ba755ce6961acee3fdac7a12f377909f3e8