[BottomAppBar][Catalog] Fix bug with transparent top app bar when in …

…bottom app bar layout

resolves #3265

PiperOrigin-RevId: 515043402

catalog/java/io/material/catalog/bottomappbar/res/layout/cat_bottomappbar_content.xml

@@ -17,18 +17,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
-  <com.google.android.material.appbar.AppBarLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:fitsSystemWindows="true">
-    <androidx.appcompat.widget.Toolbar
-      android:id="@+id/toolbar"
-      style="?attr/catalogToolbarWithCloseButtonStyle"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content" />
-  </com.google.android.material.appbar.AppBarLayout>
-
-  <androidx.core.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -79,4 +68,16 @@
         android:text="@string/cat_bottomappbar_lorem_ipsum" />
     </LinearLayout>
   </androidx.core.widget.NestedScrollView>
+
+  <com.google.android.material.appbar.AppBarLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fitsSystemWindows="true">
+    <androidx.appcompat.widget.Toolbar
+      android:id="@+id/toolbar"
+      style="?attr/catalogToolbarWithCloseButtonStyle"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content" />
+  </com.google.android.material.appbar.AppBarLayout>
+
 </merge>