[automerger skipped] Merge "Fall back to notification for for blank metadata"...

[automerger skipped] Merge "Fall back to notification for for blank metadata" into udc-qpr-dev-plus-aosp am: df934031 -s ours

am skip reason: Merged-In I4db207ee41a8dcaea5cd2ef079433b657ffc566e with SHA-1 d80aab6f is already in history

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



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