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

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



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