Fixes for errorprone update am: 770eda9f64 am: cc1ee0ecb2

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/3286281

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