[automerger skipped] Merge "Add a failsafe check to prevent display surfaces...

[automerger skipped] Merge "Add a failsafe check to prevent display surfaces from remaining hidden" into udc-dev am: 0479229a am: 26d438e1 -s ours am: 39f76a32 -s ours

am skip reason: Merged-In I6f89d8b9a9e1aa1b8673fcaffe4c1b92c4c3d210 with SHA-1 4a0e6e81 is already in history

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



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