Merge changes Ib48cc2b8,I3f0a12f1 into main am: 2c2c707d6c am: b41794b0f4

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

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