Merge "CarrierConfigManager: Adds API for persistent override of values"