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

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

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