Merge "Update surface visibility state when forcing visible" into udc-qpr-dev am: 7adb5b9f

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



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