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

[automerger skipped] Merge "Support preferred data profile correctly" am: 391556b0 am: 7cdc3869 am: 271944d0 -s ours am: b473daa1 -s ours

am skip reason: Merged-In I3cb18680ec6c77a4905901a2aa3cf3c86ce801f1 with SHA-1 9d30675a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021557

Change-Id: I2cefc901a019a2c9aba80c1d18f1fc6a2901751e