Merge changes from topic "dedup-interfaceparams" am: 6c6d7bb42f

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

Change-Id: I96d980917fd755eef982c175df50852e129d5e83