Merge "Surface should be Sync too." into main am: df516d78d9 am: 0979ab2fd0

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

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