[automerger skipped] Merge "Use voice RAT to select data profile when data...

[automerger skipped] Merge "Use voice RAT to select data profile when data OOS" am: 0300f729 am: f4872472 am: f4ed235d -s ours

am skip reason: Merged-In I99e2e6eee5565727cb2fcde76d220f74724664aa with SHA-1 ce5af672 is already in history

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



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