Merge changes I181a490b,Ie2619949,I4bd5fbdf,Ifc0c5baa,I437e6607 into main am: 4518e09375

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

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