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