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

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



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