Merge "Move getPhoneCount implementation back to TelephonyManager."
am: 7d6e085229

Change-Id: I5bca6f3d4db132fbf4a0086d38d57ccda53c2780