Merge "Address comment from aosp/1948169" am: 622c72ea49 am: 7722ddbb98

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

Change-Id: Ic84d5c7f5cd5757d7d96674818d59587e542f369