[automerger skipped] Address leftover comments am: bc65e7e992 -s ours

am skip reason: Merged-In I8973d248a1d30fdcb597677dbf051e146041f905 with SHA-1 a023f88193 is already in history

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

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