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

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



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