[automerger skipped] Merge "Move getPhoneCount implementation back to...
[automerger skipped] Merge "Move getPhoneCount implementation back to TelephonyManager." am: 59102af4 am: 7e9d7aad
am: e0e6b54b -s ours
am skip reason: change_id I097d4694a1b0957420ba4636ed8b4b1b89d63500 with SHA1 66295985 is in history
Change-Id: I24112e39eaaf60b5523d4b77f7170870b6e4ad86