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

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

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