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

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

Change-Id: Ib05cdcb3e5bdd0c75ed5f06c5bda58bfeeb8632b