Merge "[pm] fix potential NPE in system server" into udc-dev am: e6ce51f3 am: 96f1ec21 am: 0514a6c7 am: 0235def2

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



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