[automerger skipped] Address comment at ag/18491259 and ag/18486388 am: dbe8ddca71 am: 317b7decdc -s ours am: 5b433625f3 -s ours

am skip reason: Merged-In Id91fabb47b542d8526d6aa787b5947238c3934fb with SHA-1 ecec6d9350 is already in history

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

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