[automerger skipped] Merge "DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed" into sc-dev am: 14fe701b65 am: fa57bb81b2 -s ours am: 99621f173a -s ours am: e2a7d8fa7f -s ours

am skip reason: subject contains skip directive

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

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