Merge changes I44e85c09,I01810b54,I1c169311,I15f2aeac,I048512a1 into main am: 74e3f5aa48

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

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