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

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

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