Merge "Fix errorprone 2.15.0 errors" am: f04e85aafc

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2221101

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