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

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

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