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

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

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