Merge "[automerger skipped] Merge "Move getPhoneCount implementation back to...
Merge "[automerger skipped] Merge "Move getPhoneCount implementation back to TelephonyManager." am: 7d6e0852 am: 2938bf23 am: 4d67623d -s ours am skip reason: change_id I51199eaf0bd87055c21fe61af50f4c353137d621 with SHA1 19661a4b is in history"