Merge "Fix UnusedVariable errorprone issues" into main am: cce927d540

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

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