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

[automerger skipped] Merge "Fall back to notification for for blank metadata" into udc-d1-dev-plus-aosp am: a35190c2 -s ours am: 4a1a7d4c -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/+/23351942



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