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

am skip reason: subject contains skip directive

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

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