Merge changes I5676863f,Id4f30f48 into main am: 4f6359f6d6

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

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