[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 am: adf96af1 -s ours am: 81f2e132 -s ours

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

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



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