Merge changes If3217916,I86023b1f into main am: c6dc826c22

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

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