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-qpr-dev am: 6128a3ab

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



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