[automerger skipped] Merge "DO NOT MERGE: SurfaceControl: Ensure unused fields...

[automerger skipped] Merge "DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed" into sc-dev am: 14fe701b am: fa57bb81 -s ours am: 99621f17 -s ours am: aee399fe -s ours am: 0e3c5a9a -s ours am: cda0dd09 -s ours

am skip reason: subject contains skip directive

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



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