Merge "Address leftover comments" am: 0068ec2765 am: 14f20a1ce4

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

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