Merge "Update CarrierConfigLoader to support phoneId for getCarrerConfig"