Merge "Fix potential null package name" into tm-qpr-dev am: 0e12415b

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



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