[automerger skipped] Merge "Move getPhoneCount implementation back to TelephonyManager." am: 72cc8f616e am: ce573a31ff
am: db9066a233 -s ours
am skip reason: change_id Ie13f6222caa1b23b0a537edc014cccd143194b38 with SHA1 e938038361 is in history

Change-Id: I52eb7a66a114b96c9305aaff1ea18c1524f1c625