Show username if appropriate in group chips.

app/src/main/java/org/thoughtcrime/securesms/contacts/SelectedContacts.kt

@@ -30,7 +30,7 @@ object SelectedContacts {
     private val chip: ContactChip = itemView.findViewById(R.id.contact_chip)
 
     override fun bind(model: Model) {
-      chip.text = model.recipient.getShortDisplayName(context)
+      chip.text = model.recipient.getShortDisplayNameIncludingUsername(context)
       chip.setContact(model.selectedContact)
       chip.isCloseIconVisible = true
       chip.setOnCloseIconClickListener {

app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java

@@ -650,8 +650,9 @@ public class Recipient {
     String name = Util.getFirstNonEmpty(getGroupName(context),
                                         getSystemProfileName().getGivenName(),
                                         getProfileName().getGivenName(),
-                                        getDisplayName(context),
-                                        getUsername().orElse(null));
+                                        getE164().orElse(null),
+                                        getUsername().orElse(null),
+                                        getDisplayName(context));
 
     return StringUtil.isolateBidi(name);
   }