[automerger skipped] Merge "DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed" into sc-dev am: 14fe701b65 am: 7380dd5932 -s ours am: b2ea362fce -s ours am: 28d5e73930 -s ours

am skip reason: subject contains skip directive

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

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