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

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

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