Merge changes from topic "dedup-interfaceparams" am: a63535bfd1 am: bd73b3be65

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

Change-Id: I1807a7b37c030c7e64859eb9ae2771edd7ae7b5b