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

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

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