Fix errorprone warnings that should be errors am: 50b73ca58a

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

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