Merge changes I5676863f,Id4f30f48 into main am: 4f6359f6d6 am: 2dd3acbb0b

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

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