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: I605aaf57e418d4c8339107bd4f3f3afbb6620106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>