Merge "Move CarrierConfigLoader registrar call to init"