[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 skip reason: subject contains skip directive

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



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