Merge "Have getPhoneType return PHONE_TYPE_NONE for non-voice capable devices." into honeycomb