Merge "Fix errorprone 2.15.0 errors" am: f04e85aafc am: c85d942a3e am: 1b20389039 am: 0ba04e53a3 am: 9064d97e97

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

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