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

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



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