[automerger skipped] DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed am: 61a52db9 -s ours am: 376c68a3 -s ours

am skip reason: subject contains skip directive

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



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