Merge changes Ib48cc2b8,I3f0a12f1 into main am: 2c2c707d6c

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

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