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: b2f6bb20
* commit 'b2f6bb20':
Change-Id: I67ac903224add774c447bc0ec737913a0daae18e