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

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

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