Merge changes Ie2c35190,I6bd9ceeb,I823c8e94,I1b4868ba into main am: d9a752d866

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

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