[automerger skipped] DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed am: 34fe38b0c7 -s ours am: ead2c6d0b3 -s ours am: 78dcf33a4a -s ours am: c438c35265 -s ours am: f9df84dd74 -s ours am: c965b7b5c3 -s ours am: dd3b434986 -s ours

am skip reason: subject contains skip directive

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

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