Merge "Fix -Wunused-variable compiler warning" into main am: 76a85e9218 am: a862458648

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

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