Merge "Undo isDataCapable as Public API" am: 7abd26ae78

Change-Id: Ib71163d76a1fc3af1eda1b5e41346c315e45a918