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

Change-Id: Ia76e9ec0dd9805c38cfac8f21fd4598226d91683