Merge "Do not relayout on default focus highlight." into oc-dev

am: badb83b332

Change-Id: I7174ffcfef9d32b4b7559251060cea8ce8a34d58

core/java/android/view/View.java

@@ -19794,7 +19794,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
                 && (mForegroundInfo == null || mForegroundInfo.mDrawable == null)) {
             mPrivateFlags |= PFLAG_SKIP_DRAW;
         }
-        requestLayout();
         invalidate();
     }