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

Change-Id: Ide3634eaf223b649af4b473d84503de36e6037e4