Merge changes I1731e65e,I2df84427 into main am: f411c02294

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

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