Merge changes I2dd18f9d,I5cc02c8a into main am: 25e0517124 am: 6de5d1f5c3

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

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