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: Ib11cd622794b805b3519bd3599f3aac52427de04