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

Merge "Fix -Wunused-variable compiler warning" into main am: f837fd0a am: 7a9ed376 am: 0c1f9905

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



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