Merge changes I34903b57,Ic818aa55 into main am: a055890412 am: 4d01fd0b0b am: e7c0075343

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

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