Merge "Revert "SurfaceView: Synchronize all surface view changes with V..."" into tm-dev am: 1f014a4a51 am: 2c35b4e9b5

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

Change-Id: Iaf02520af28a6d454e342fc3cd09127771ffeb17