Merge changes I71abf9d0,I57f25f5e,If6b15419 into main am: 6f2b294fd0

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

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