Merge "Fix errorprone warnings that should be errors" am: 46c7146be5

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

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