Merge "Address comment from ag/12107302" into main am: 88c497c2e5

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

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