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

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

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