Merge "initial value for data_roaming based on carrier" am: 973ddd55eb am: 0c2b4d7308 am: f2efda4f20
am: 6179997bb9

Change-Id: I7da77a84baaad077de2a73e6acf388ccc8279981