Improve surface visibility recovering with transition am: b81e181cc5

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

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