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

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



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