Merge "Change to return phone count as 0 if voice, sms, data not supported."...
Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev am: fc6a3ad8
am: 15b33c63
* commit '15b33c63':
Change-Id: I973d6f1791e11e4ec0e8fdccbe2d8f234a5869ca