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

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

Change-Id: I9d8bf05e90eafba122de767cd980b30a1a79c93c