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

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

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