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

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

Change-Id: I1405d0915e32e1aae94d870bab1b9a57793325d8