Merge changes I5fffc137,Ifc076a8d into main am: 8f329c2e97 am: 9330036320

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

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