[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 am: 473fbc46 -s ours am: 9a9ff01c -s ours am: a30aa586 -s ours

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

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



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