[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 -s ours am: bdd42fd5 -s ours am: 73c94268 -s ours

am skip reason: skipped by user ethibodeau

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



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