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

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

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

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