Merge "Fix bug #7164967 android.view.cts.ViewGroup_MarginLayoutParamsTest#testResolveMarginsRelative failures on JO" into jb-mr1-dev

core/java/android/view/ViewGroup.java

@@ -5990,11 +5990,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
          */
         @Override
         public void resolveLayoutDirection(int layoutDirection) {
-            // No need to resolve if it is the same layout direction as before
-            if (this.layoutDirection == layoutDirection) {
-                return;
-            }
-
             setLayoutDirection(layoutDirection);
 
             if (!isMarginRelative()) return;