Address comment at ag/18491259 and ag/18486388 am: dbe8ddca71

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

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