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

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



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