Merge changes I34903b57,Ic818aa55 into main am: a055890412 am: e6811771c1 am: 77e68a0cc3

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

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