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

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

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