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

Merge "Fix -Wunused-variable compiler warning" into main am: a0511750 am: 18e1c0d6 am: 4a6c9f10

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



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