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: I2e6d1221d49d62c21606153fcf81d8e13af280f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>