Merge "Fallback to default display if initial one is detached" into udc-dev am: 1f7b255b

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



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