Merge changes I76b0a7ba,If7308f1a,Ica8faced,Ia8f42ed0,I975afb45, ... into main am: 58526e4d96

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

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