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

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



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