Merge "Fix errorprone 2.15.0 errors" am: f04e85aafc am: c85d942a3e am: 1b20389039

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

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