Merge "Address comments on aosp/2765367" into main am: 6dfb7c7c90 am: 4ec3428bd7 am: 10ff0dff7d

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

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