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

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



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