Merge changes from topic "am-ccae4e67f611463c9301c2eabbc8a927" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed" into sc-v2-dev am: a98de091 -s ours am: ee34c77c -s ours am: 71fb3292 -s ours
  [automerger skipped] DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed am: 61a52db9 -s ours am: 376c68a3 -s ours am: ef9eaee4 -s ours