Merge "Move getPhoneCount implementation back to TelephonyManager."