Merge "Remove the VisibleForTesting annotation." into main am: 9dbe69420d

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

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