Merge "Fix errorprone warnings that should be errors" am: bbb6792a78 am: 21e696b760

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

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