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

Merge "Fix -Wunused-variable compiler warning" into main am: 76a85e92 am: a8624586 am: 4314f1e4

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



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