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

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

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