Merge "Enable Carrier-Config cache for Settings"