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

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



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