Merge "Fix null pointer exception when getting app label for headless app"...

Merge "Fix null pointer exception when getting app label for headless app" into udc-d1-dev am: d4c13186 am: 10daa041 am: 39f07b57

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



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