Merge changes Ibe22b300,I0b0f0bf1 into main am: 2c7e2b8448 am: 8388a94f6e

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

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