Merge changes I3286aeb1,I060509de into main am: 71bba4e45f

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

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