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

[automerger skipped] DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed am: a7c45f4f -s ours am: 1d94240c -s ours am: 4d166cda -s ours am: 6461606a -s ours am: 34235a56 -s ours

am skip reason: subject contains skip directive

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



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