Merge changes I1731e65e,I2df84427 into main am: f411c02294 am: fa03800d1e

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

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