Merge changes Ia5fc3e53,Ie1ab6013,I1cd5acb3 into main am: ebdda22240 am: 763cb37248

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

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