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

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

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