Merge "Address leftover comments" into main am: bbaacf4d38

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

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