Merge "Gracefully handle duplicate network interface" into tm-dev am:...

Merge "Gracefully handle duplicate network interface" into tm-dev am: 3c8a478a am: 4f0cc7cd am: 8f599b00

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



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