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

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

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