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

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

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