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

[automerger skipped] DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed am: 34fe38b0 -s ours am: ead2c6d0 -s ours

am skip reason: subject contains skip directive

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



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