Merge "surface_control: Add missing nullability annotations" into main am: 71566b29e7

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

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