Merge "Fixes for errorprone update" into main am: 7464a30bd9

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

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