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

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

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