Merge changes Ic9fbf2f9,I1eb54c07 into main am: 2af727b8ca am: 14babb4c60

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

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