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

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

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