Merge "Have SmsMessage use getCurrentPhoneType" into honeycomb