Merge "Prevent wrong data selection pop up while activating a new subscription...

Merge "Prevent wrong data selection pop up while activating a new subscription in DSDS." into tm-qpr-dev am: 620e1816 am: c9117509

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



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