Merge changes I6cc2507d,I187ea15d into main am: 16828bdeba am: 3460d13172

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

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