Fix the area code cut bug

Change-Id: Ie61e3213b83ad8f3b5fceacd5ae9adc1da3f283e

Conflicts:

	src/com/android/mms2/ui/chips/RecipientEditTextView.java
No avatars option for speech bubbles theme

Change-Id: I27c057ed1848550c7324ba518853ebec9ac457c5

Conflicts:

	src/com/android/mms2/ui/ComposeMessageActivity.java
Fix max bubble width when no avatars

Change-Id: I12d21b20531a2c2f4171a4158675d3b36a46b254

Conflicts:

	res/layout/compose_message_activity_bubbles.xml