Merge changes I2dd18f9d,I5cc02c8a into main am: 25e0517124

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

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