Merge "Gracefully handle duplicate network interface" into tm-dev am: 3c8a478a am: a2b5da40

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17677601



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