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

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

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