Merge "Fix UnusedVariable errorprone issues" into main am: fb2f68febc am: fedc9271ab

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/3284245

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