[automerger skipped] Merge "Add carrier config for roaming meteredness" am: 1d7a6d3cc1 am: f7cda20342 -s ours
am skip reason: Change-Id I07e9fd2cf42de8c6f924cda5e16aa6820baef4cd with SHA-1 dc310318e9 is in history
Change-Id: I36c1a2ee75a12ec0ebb3f8a307641899a5334bb8
This commit is contained in: