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

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

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