Merge changes Ic9fbf2f9,I1eb54c07 into main am: 2af727b8ca

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

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