Merge "Fix the comments from aosp/1719018" am: 0c20c4901f am: 9adee2f105

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

Change-Id: I41abc59d63961c4a1ee70ec6f09738cd56c41f9f