Merge "new SystemAPI for setCarrierDataEnabled"