Merge changes Ibe22b300,I0b0f0bf1 into main am: 2c7e2b8448

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

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