Merge "Address leftover comments" am: 68936325f0

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

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