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

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

Change-Id: Ie9f81324208c30769044c8874d85961f4bbebac6