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

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

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