Merge "SF: remove the redundant variable on updateCursorAsync." into main am: a82e90f52e am: 406ba18ec6 am: aa753e41e1

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

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