Merge "Fix errorprone warnings that should be errors" am: 9ce8425e am: a013801e am: c9bd37e4

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



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