Merge "Fix errorprone warnings that should be errors" am: f29573fe

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2256749



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