Merge changes Ibadd782d,I8704dccf into main am: f4a71a1101

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

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