Merge "Expose TelephonyManager#{set,get}DataEnabled." am: 99d6227782 am: fa8e6c0f5a am: b369ad4b19
am: 1cea0c249d  -s ours

Change-Id: I759166ff02040ac7244b35815de04230773dff5d