Merge "[Bugfix]fix NullPointException when pkg is null" am: 8dd810b3d6 am: d14460ea9c

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

Change-Id: Iff9a7a9514b886576e20da2289a5aed1dd5d04f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>