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

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

Change-Id: Ic85a15713454028118c328dfb978a644a1efabc1