Merge "Stick with preferred data profile" am: 7d2247c0 am: 9f426e76

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



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