Merge changes Ib48cc2b8,I3f0a12f1 into main am: 2c2c707d6c am: fc919f3d7b am: 89175347d5

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

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