Merge "SF: remove the redundant variable on updateCursorAsync." into main am: a82e90f52e am: 9257165981 am: e2fa7776fa

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

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