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