Merge "Move getPhoneCount implementation back to TelephonyManager."
am: 72cc8f616e

Change-Id: I0a8ab5955e55b77ec605f22070e5f45585b58f85