Merge "CarrierConfigManager: Adds API for persistent override of values" am: 9be4d11abb
am: 52d95ed0ed

Change-Id: Ibbf4f327c266194fb74c508ab96ba3d199ca1ac9