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

Merge "[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: 71399558 -s ours" into tm-d1-dev-plus-aosp am: c9687d4f

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



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