Merge "AutoSize TextView - fix transformation method" into oc-mr1-dev

am: 8719c2a8e6

Change-Id: I4a2c15dfdd59da941aa679bb948f43d10499c7cc

core/java/android/widget/TextView.java

@@ -8341,7 +8341,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
     }
 
     private boolean suggestedSizeFitsInSpace(int suggestedSizeInPx, RectF availableSpace) {
-        final CharSequence text = getText();
+        final CharSequence text = mTransformed != null
+                ? mTransformed
+                : getText();
         final int maxLines = getMaxLines();
         if (mTempTextPaint == null) {
             mTempTextPaint = new TextPaint();