[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: 78dcf33a -s ours am: c438c352 -s ours am: f9df84dd -s ours

am skip reason: subject contains skip directive

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



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