Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb