am b7559e02: am 56205fea: Merge change 23345 into donut

Merge commit 'b7559e02803266e5fa9f4496174bc343ecd245ab' into eclair-plus-aosp

* commit 'b7559e02803266e5fa9f4496174bc343ecd245ab':
  Fix an emoji-measuring bug that caused an exception when editing a contact.