Fix errorprone warnings that should be errors am: 50b73ca58a am: f812cb353b am: 9000f7ab0b

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

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