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

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

Change-Id: I7d68aa00f1ab8f34ec789c4f7f5f0b051b81d546