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: b2f6bb20cd
* commit 'b2f6bb20cd6584aee813f27225e3e6b25537ca69':
Change-Id: I67ac903224add774c447bc0ec737913a0daae18e
This commit is contained in: