Rename mainAxisAlignment to Arrangement

Bug: 144278055
Test: ui-layout and ui-material integ tests; manually checked demos
Change-Id: I430e3fb5fbdac7d61d7ccd307ef54aba99a9e807

diff --git a/ui/ui-layout/api/restricted_current.txt b/ui/ui-layout/api/restricted_current.txt
index a01fd6a..ff82c7a 100644
--- a/ui/ui-layout/api/restricted_current.txt
+++ b/ui/ui-layout/api/restricted_current.txt

@@ -13,6 +13,26 @@
     method public static void CenterAlignmentLine(androidx.ui.core.AlignmentLine alignmentLine, kotlin.jvm.functions.Function0<kotlin.Unit> children);
   }
 
+  public final class Arrangement {
+    ctor public Arrangement(internal kotlin.jvm.functions.Function2<? super androidx.ui.core.IntPx,? super java.util.List<androidx.ui.core.IntPx>,? extends java.util.List<androidx.ui.core.IntPx>> arrangeBlock);
+    field public static final androidx.ui.layout.Arrangement.Companion! Companion;
+  }
+
+  public static final class Arrangement.Companion {
+    method public androidx.ui.layout.Arrangement getBegin();
+    method public androidx.ui.layout.Arrangement getCenter();
+    method public androidx.ui.layout.Arrangement getEnd();
+    method public androidx.ui.layout.Arrangement getSpaceAround();
+    method public androidx.ui.layout.Arrangement getSpaceBetween();
+    method public androidx.ui.layout.Arrangement getSpaceEvenly();
+    property public final androidx.ui.layout.Arrangement Begin;
+    property public final androidx.ui.layout.Arrangement Center;
+    property public final androidx.ui.layout.Arrangement End;
+    property public final androidx.ui.layout.Arrangement SpaceAround;
+    property public final androidx.ui.layout.Arrangement SpaceBetween;
+    property public final androidx.ui.layout.Arrangement SpaceEvenly;
+  }
+
   public final class AspectRatioKt {
     ctor public AspectRatioKt();
     method public static androidx.ui.core.LayoutModifier AspectRatio(@FloatRange(from=0.0, fromInclusive=false) float value);
@@ -126,10 +146,10 @@
 
   public final class FlexKt {
     ctor public FlexKt();
-    method public static void Column(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, kotlin.jvm.functions.Function1<? super androidx.ui.layout.ColumnScope,kotlin.Unit> children);
+    method public static void Column(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.Arrangement arrangement = Arrangement.Begin, kotlin.jvm.functions.Function1<? super androidx.ui.layout.ColumnScope,kotlin.Unit> children);
     method public static void FlexColumn(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.layout.CrossAxisAlignment crossAxisAlignment = CrossAxisAlignment.Start, androidx.ui.layout.LayoutSize crossAxisSize = androidx.ui.layout.LayoutSize.Wrap, kotlin.jvm.functions.Function1<? super androidx.ui.layout.FlexChildren,kotlin.Unit> block);
     method public static void FlexRow(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, androidx.ui.layout.CrossAxisAlignment crossAxisAlignment = CrossAxisAlignment.Start, androidx.ui.layout.LayoutSize crossAxisSize = androidx.ui.layout.LayoutSize.Wrap, kotlin.jvm.functions.Function1<? super androidx.ui.layout.FlexChildren,kotlin.Unit> block);
-    method public static void Row(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.MainAxisAlignment mainAxisAlignment = androidx.ui.layout.MainAxisAlignment.Start, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> children);
+    method public static void Row(androidx.ui.core.Modifier modifier = Modifier.None, androidx.ui.layout.Arrangement arrangement = Arrangement.Begin, kotlin.jvm.functions.Function1<? super androidx.ui.layout.RowScope,kotlin.Unit> children);
   }
 
   @androidx.ui.layout.LayoutScopeMarker public abstract sealed class FlexScope {