[automerger skipped] Merge "Fallback to default display if initial one is...

[automerger skipped] Merge "Fallback to default display if initial one is detached" into udc-dev am: 1f7b255b am: 6884adcf am: 0584e02a -s ours

am skip reason: Merged-In I196bab294c182230edda54241f7b725f44f05570 with SHA-1 7d860098 is already in history

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



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