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

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

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



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