Address comment from aosp/1948169 am: 5545291ef5 am: c6f0c0287b am: a9bcf7eb01

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

Change-Id: I3658db08aa27c0e90efd582752f602ef089ba4bb