Merge changes Ibd38e3c0,I0e9f52aa into main am: 7475acf7e2 am: f3a0ef7b0b am: 8e1f783b04

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

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