Merge changes I6cc2507d,I187ea15d into main am: 16828bdeba

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

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