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

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



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