Merge changes Iceacbcab,I849ab478,I145de9bf into main am: 6150ec80cc

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

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