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

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

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