Merge "Fallback to default display if initial one is detached" into udc-qpr-dev am: 6f69b19c

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



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