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

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

Change-Id: I11ffe75dc171bfdd2330649c352c33e2ca054c84