Merge "Fix formatting errors in CarrierConfigManager"