Merge "Merge "Change to return phone count as 0 if voice, sms, data not supported." into nyc-dev am: fc6a3ad85b am: 15b33c636c" into nyc-mr1-dev-plus-aosp
am: 2c715aca20
* commit '2c715aca2023639ca83314aa3eb656ab8a33b70d':
Change-Id: I0f55f1880f50f88ce8fb4e4498c92e9664ab0153
This commit is contained in: