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

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

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