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

[automerger skipped] Merge "Fall back to notification for for blank metadata" into udc-dev am: e727bdee am: 1a44e9dd -s ours am: 6473a11e -s ours am: c36afa42 -s ours

am skip reason: skipped by user ethibodeau

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



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