Merge "Add a failsafe check to prevent display surfaces from remaining hidden"...

Merge "Add a failsafe check to prevent display surfaces from remaining hidden" into udc-dev am: 0479229a

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



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