Merge changes Ic9fee5bb,I30fa35ce,If52cc211,I87e9d710 into main am: 3575c37e47

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

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