[automerger skipped] Merge "Make hidden API isDataCapable for Telephony" am: a4335f0840 am: 75e9dfa509 am: 2a6f638ae4 -s ours
am skip reason: Change-Id I96b45575eb7f030f3dcb9539c06f8ec25539e2e9 with SHA-1 291415806f is in history

Change-Id: Id0289e1c3733619459a62c37ebd848487d27128c