Merge "Fixes all remaining potential NPEs related to pkg" into rvc-dev am: 9cd979a6f7 am: d5a0b76227 am: 84f91ae56b am: 5d4338ed14

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

Change-Id: Icbf0c4b5a8e8d0dfe47449c9ba23f075bbef32e3