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

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

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