Merge "Fix errorprone warnings that should be errors" am: fff8b9325c am: 25aa4e149b am: 97a247b68d

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

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