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

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



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