Merge "SF: fix redundant assignment operation." into main am: e0d0965baf am: 38e6377537 am: 07a6e895fd

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

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