Merge "Fix -Wunused-variable compiler warning" into main am: f837fd0a65 am: 06bef953a6

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

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