Merge "[pm] fix potential NPE in system server" into udc-dev am: e6ce51f3

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



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