Merge changes I5fffc137,Ifc076a8d into main am: 8f329c2e97

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

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