[automerger skipped] Merge "Fix potential null package name" into tm-qpr-dev...

[automerger skipped] Merge "Fix potential null package name" into tm-qpr-dev am: 0e12415b am: 494ce15e -s ours

am skip reason: Merged-In Ia706a503f9ca068fc997c0acdcd74ca62a1424be with SHA-1 2b69e2cf is already in history

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



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