[automerger skipped] DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed am: 61a52db9d3 -s ours

am skip reason: subject contains skip directive

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

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