Merge "Fix null pointer exception when getting app label for headless app" into udc-qpr-dev am: 9369c760c9 am: 4edc37f2c5

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

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