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

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



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