[automerger skipped] Merge "Update surface visibility state when forcing...

[automerger skipped] Merge "Update surface visibility state when forcing visible" into udc-qpr-dev am: 7adb5b9f am: 7239f180 -s ours

am skip reason: Merged-In I1d6c2e5a0dad831a9a7043d390037ca15a8b14bd with SHA-1 1c18c583 is already in history

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



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