[automerger skipped] [automerged blank] DO NOT MERGE: SurfaceControl: Ensure...

[automerger skipped] [automerged blank] DO NOT MERGE: SurfaceControl: Ensure unused fields are zeroed 2p: 34fe38b0 2p: 301399bc am: e30e7814 am: 6bd50691 am: 917984de am: 8ccc4910 -s ours

am skip reason: subject contains skip directive

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



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