Merge "SurfaceView: Synchronize visibility changes with VRI frame" into sc-v2-dev am: f3a504e3d6 am: 7e71240c2a

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

Change-Id: If1ea2287a004a2d3b115d88496fe030b3512452d