[automerger skipped] Merge "Address leftover comments" am: e2791b00d3 am: a9d6f3c4c5 -s ours

am skip reason: Merged-In I9056758db15e8a21b84ef244d4cacf24c3b79894 with SHA-1 5d8340f7ae is already in history

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

Change-Id: Ica52d40b4488375b279ece40d595d81eec8767cd