Merge "Address aosp/1740740 leftover comments" am: 1975a57e83

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

Change-Id: I8a901187e66a5f6dade6dfe36951949dcf80d458