Merge "Support preferred data profile correctly" am: 391556b01c am: 7cdc386951

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

Change-Id: I9548d527c7c02aad18fc2d5798a0e9ec1b1924ff