Merge "Make isDataEnabledForApn() a system api." am: 7ab5b4928f
am: 99bf1aa159

Change-Id: Ib7c88ef08f296e56cd7488f363e142e61ac2fa3f