Merge "Fix errorprone warnings that should be errors" am: 8094daef5b

Original change: https://android-review.googlesource.com/c/platform/packages/providers/CalendarProvider/+/2256823

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