Merge "[automerger skipped] Merge "Make isDataCapable a public API" am:...

Merge "[automerger skipped] Merge "Make isDataCapable a public API" am: bdee4edb am: 1e83a9ea -s ours am skip reason: Change-Id I4f5dd3440e403b96112bf2e848bffb5aac299732 with SHA-1 b5fe6f5f is in history" into rvc-dev-plus-aosp am: 93d368bd -s ours am: 69d38585 -s ours am: d309fc8a -s ours
am skip reason: Change-Id I4f5dd3440e403b96112bf2e848bffb5aac299732 with SHA-1 b5fe6f5f is in history

Change-Id: I9b2599bf606f07addc8442d006607526cf57b48f