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

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

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