Merge "new SystemAPI for setCarrierDataEnabled"
am: 7dd38c2115

Change-Id: I37981416901ce00637392a1289cb627e27750666