Merge "Fix -Wunused-variable compiler warning" into main am: a051175027 am: e884c3c503

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

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