Merge "[pm] fix potential NPE in system server" into udc-dev am: e6ce51f3 am: 96f1ec21 am: 1d60da66 am: 4e86d685

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



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