[automerger skipped] Merge "Make isDataEnabledForApn() a system api." am: 7ab5b4928f am: 99bf1aa159
am: 479a4e5d32 -s ours
am skip reason: change_id Icbb29124294972766f68533b7e23700dd491c075 with SHA1 505e174176 is in history

Change-Id: I69f7dea8dec2c5f4388728193fe56d02dbd5788f