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: I65dd02aacd50acb92d15c76457f8415b0cc8b73e