Merge "Fix -Wunused-variable compiler warning" into main am: f837fd0a65 am: 7a9ed3764d

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

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