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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2858973

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