Merge "Revert "Add unit test for CarrierConfigLoader""