[automerger skipped] Merge "new SystemAPI for setCarrierDataEnabled" am: 7dd38c2115 am: 6ec00c2584
am: 39f0965925  -s ours

Change-Id: I3126061d8affa6981c42c9b8e52fb8f48a943fde