[automerger skipped] Support preferred data profile correctly am: a6b309b2...

[automerger skipped] Support preferred data profile correctly am: a6b309b2 am: 7e011060 am: 8dc5cd60 -s ours

am skip reason: Merged-In I8c403259b92cf812825abcbd3ccfcd602cba9526 with SHA-1 f22b2f86 is already in history

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

Change-Id: Id04be21d10ad34ac3b049c804886b12b9eda0af5