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

am skip reason: skipped by user racarr

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

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