Fixes for errorprone update am: 770eda9f64 Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/3286281 Change-Id: I9ca8a2cd5dc07f386ef1009bafd8a93dc6bfc19b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>