Merge "Address leftover comments" am: e2791b00d3

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

Change-Id: I97628a5e88d4410f0745c4a0b1d1bc3bef8111e5