Merge changes I9fb420ec,If00a7dc5,I8025cc2e into main am: 495fe09110 am: b6335e2f2d

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

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