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

Merge "Fix -Wunused-variable compiler warning" into main am: a0511750 am: e884c3c5 am: f1af754a

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



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