Merge "Fallback to default display if initial one is detached" into udc-dev...

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

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



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