[automerger skipped] Improve surface visibility recovering with transition am:...

[automerger skipped] Improve surface visibility recovering with transition am: b81e181c am: 86f4a43d -s ours

am skip reason: Merged-In I2ecb714ef0eaf94f8950bd4cd3857abfb1c46fbc with SHA-1 3fc49ae1 is already in history

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



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