Merge changes I2368f118,I57eb7c6d,I66e4e537,If510519b,Ia441170c into main am: daab4db187 am: 7f7571c55f

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

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