Merge "Enhance fallback UI for single entry" into udc-dev am: 54a9873a am: 1d24dc03

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



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