Merge changes I8f83d042,I3d6a6a07,If088188b,Ia0c1f55a into main am: 8cfccc9de4 am: 49eeaddfeb

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

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