Merge "Fix errorprone warnings that should be errors" am: 70df3ac6bc

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

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