Merge "Make isDataEnabledForApn() a system api." am: a58cc9f29f
am: 278d21dc4b

Change-Id: I9a02bb8a784745b4f120b016d46b22cca551ad6c