Merge "SurfaceView: Synchronize position updates with fixed size changes" into sc-dev am: 5d7ae9063a am: 94d44d35cd

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

Change-Id: Iae619e9c678af12716b57269197c2fbce2ddc05d