[automerger skipped] Address comments on ag/14486203 am: 20c7cad598 am: a7697d1718 -s ours

am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

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

Change-Id: I93df35e2457bf7600e061af894cc1dd50e490d04