Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev
am: fc6a3ad85b

* commit 'fc6a3ad85bcac1df6b0fc1f79ec65f1a23eb8f71':
  Change to return phone count as 0 if voice, sms, data not supported.

Change-Id: Ideaaec05272ecee36504e7207d1187a7d2cdcd5f