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

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

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



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