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

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



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