Merge "Add carrier config for roaming meteredness" am: 1d7a6d3cc1

Change-Id: I890063a376285b3d23e4c5eafc71dfb7fe2016b7