Merge "Fix errorprone warnings that should be errors" am: fff8b9325c

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2256762

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