Merge "Make isDataCapable a public API" am: 965d021bf5 am: abed1c46be

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629275

Change-Id: Ic06e74f162937597af19e3b44fc337d920f5f635