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

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

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