[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: 7380dd59 -s ours am: b2ea362f -s ours am: 28d5e739 -s ours am: e1062a8c -s ours

am skip reason: subject contains skip directive

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



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