Merge changes Ibe22b300,I0b0f0bf1 into main am: 2c7e2b8448 am: 9fbac72ca9 am: 1e5c6e313f

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

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