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

Merge "Fix -Wunused-variable compiler warning" into main am: f837fd0a am: 06bef953 am: 66a34017

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



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