Merge "Address comment from aosp/2335004" am: c4732276d4

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

Change-Id: I54f8301276dd2c3c6527be48b9703d95e95888cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>