[automerger skipped] Merge "DO NOT MERGE: SurfaceControl: Ensure unused fields...

[automerger skipped] Merge "DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed" into sc-v2-dev am: a98de091 -s ours am: ee34c77c -s ours am: 71fb3292 -s ours am: 5b232776 -s ours

am skip reason: subject contains skip directive

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



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