Merge "[Bugfix]Modify SurfaceControl setColor callName error." into main am: 0263ec03f9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3261780

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