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

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

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