Merge "Duplicate Data Selection Dialog during SUW" into tm-dev am: b5833f78

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



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