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

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

Change-Id: Ic1467eee4f066d48a71d963e65eeac708443c480