Merge "new SystemAPI for setCarrierDataEnabled" am: 7dd38c2115
am: 6ec00c2584

Change-Id: I83fa3369a48b9cc6bfe962f2ae101f06709793ae