Merge changes If33414ec,I8f211e47,If05c0c53 into main am: ae0971b4ae am: d5b0dbd5a7 am: a774477a4e

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

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