[automerger skipped] Merge "Move getPhoneCount implementation back to TelephonyManager." am: 7d6e085229 am: 2938bf23f7
am: 4d67623dad -s ours
am skip reason: change_id I51199eaf0bd87055c21fe61af50f4c353137d621 with SHA1 19661a4b4a is in history

Change-Id: I12753f34de77e5cca1dc0e67689916dea445052b