[automerger skipped] Merge "Undo isDataCapable as Public API" am: 7abd26ae78 am: 62fe99d1a8 -s ours

am skip reason: Change-Id I8b6a7e001c114df5e90668738b2a2b978e8757fa with SHA-1 d9d7abb899 is in history

Change-Id: I50b9f594edf8096e477c6335c02074c23930c39b