Merge "SF: fix redundant assignment operation." into main am: e0d0965b am: 38e63775

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



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