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

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

Change-Id: I8b83100d8d3945538b8fee0860bcf1d7cbbcaa91