[automerger skipped] Merge "SurfaceView: Synchronize initial destframe change...

[automerger skipped] Merge "SurfaceView: Synchronize initial destframe change from BBQ" into sc-v2-dev am: 85200056 am: 52347713 -s ours

am skip reason: Merged-In Ibf53a0efdebb87291d081e48633c373a98d347b1 with SHA-1 87d71d6d is already in history

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

Change-Id: Ieb75ce30f8a6709b943fe344b5fd7a5418603e93