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

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

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