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

Merge "Fix -Wunused-variable compiler warning" into main am: e6d39e67 am: 83933ce1 am: a15a3a80

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



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