Merge "Address leftover comments" into sc-dev am: 9a8e4497a3

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

Change-Id: Ie3e82c84cdfe8a9ea6a01859501f67ea472bc969