Merge "Merge "Move getPhoneCount implementation back to TelephonyManager." am: 7d6e0852 am: 2938bf23" into pi-dev-plus-aosp