Merge "[automerger skipped] Merge "Make isDataCapable a public API" am: bdee4edb08 am: 1e83a9eaf9 -s ours am skip reason: Change-Id I4f5dd3440e403b96112bf2e848bffb5aac299732 with SHA-1 b5fe6f5f15 is in history" into rvc-dev-plus-aosp