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

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

Change-Id: I660945c4e04e6bde7b9ed96f7c5a1887e2e1f861