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

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

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