Merge "Make hidden API isDataCapable for Telephony" am: a4335f0840

Change-Id: I9de9160762fa625267026dc376c591242a3287e8