Merge "Address leftover comments" am: 0068ec2765

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

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