[automerger skipped] Merge "surface_control: Add missing nullability...

[automerger skipped] Merge "surface_control: Add missing nullability annotations" into main am: 71566b29 am: d4433288 -s ours

am skip reason: Merged-In Ia1a456041daf8136d856a1901881b74f97b3593a with SHA-1 c2440ff1 is already in history

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



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