Merge changes Ibe285aef,I318df93e into main am: f8b1d2a1ed am: dcfcbedacd

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

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