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

[automerger skipped] Merge "DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed" into sc-qpr1-dev am: 36cff7cc -s ours am: c8d3960e -s ours am: 1e40a2f6 -s ours am: ab903bc4 -s ours

am skip reason: subject contains skip directive

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



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