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

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



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