[automerger skipped] Merge "Stick with perferred data profile" into tm-qpr-dev...

[automerger skipped] Merge "Stick with perferred data profile" into tm-qpr-dev am: e431b724 -s ours am: 0f986ffb -s ours

am skip reason: Merged-In I9b8ae99c3fa6846a4d5648f4383f22402dc5118b with SHA-1 6426e5d6 is already in history

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



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