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

Merge commit 'f84b803478eeb3ce34da55f242d9b9685c6c943d'

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

core/java/android/text/Layout.java

@@ -1527,7 +1527,7 @@ public abstract class Layout {
                     if (bm != null) {
                         workPaint.set(paint);
                         Styled.measureText(paint, workPaint, text,
-                                           offset, offset + 1, null);
+                                           j, j + 2, null);
 
                         float wid = (float) bm.getWidth() *
                                     -workPaint.ascent() / bm.getHeight();