Merge "Fall back to notification for for blank metadata" into udc-dev am: e727bdee

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



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