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

Change-Id: I48ba90447ffc50109324b1da1bfe3f6281509622