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

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

Change-Id: I2348c18d29ccf42fd48fcb7c0a23403059db249a
Signed-off-by: Automerger Merge Worker <[email protected]>