Merge changes Ibadd782d,I8704dccf into main am: f4a71a1101 am: 42c66ae70a am: c953d4cb98

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

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