Merge changes I34903b57,Ic818aa55 into main am: a055890412

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

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