[automerger skipped] Merge "Replace isNetworkSupported with isDataCapable in...
[automerger skipped] Merge "Replace isNetworkSupported with isDataCapable in Telephony" am: 11cda4d9 am: f3e9bdec am: a7f3e364 -s ours
am skip reason: Change-Id Iae462d9df21a69c8c7a3af54b7dfa34d1ae43752 with SHA-1 4fe816dd is in history
Change-Id: I80f0349127f680251e3dbbf19c715393f467b1b3