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

Merge "[pm] fix potential NPE in system server" into udc-dev am: e6ce51f3 am: 80479c65 am: 909d21ee am: 3786a4f1

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



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