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

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

Change-Id: I94aaa390bedd0a446aee4ebe5142bb8c7d53dc11