[automerger skipped] Merge "Make isDataEnabledForApn() a system api." am: a58cc9f29f am: 278d21dc4b
am: b90be3a8ba -s ours
am skip reason: change_id I816972df567dd210822edc30f9434a39c7815e46 with SHA1 5d4e1921a5 is in history

Change-Id: Idc4ad059004972c3be3f693c4a8edbafce9aeaf3