Merge "Add CarrierConfig for metered roaming" into nyc-dev