Swap cookies and permissions section in page info

Swap the cookies section and the permissions section to have permissions
close to the site settings button.

Screenshot: https://crbug.com/1040091#c26
Bug: 1040091
Change-Id: If8fb0bb256caa47c05e4c4829763b8c81b73900b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2095723Reviewed-by: Balazs Engedy <engedy@chromium.org>
Commit-Queue: Christian Dullweber <dullweber@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748678}

components/page_info/android/java/res/layout/page_info.xml

@@ -96,6 +96,19 @@
         app:buttonColor="@color/app_banner_install_button_bg"
         style="@style/FilledButton" />
 
+    <View
+        android:id="@+id/page_info_cookie_controls_separator"
+        android:layout_marginTop="16dp"
+        style="@style/HorizontalDivider"/>
+
+    <org.chromium.components.page_info.CookieControlsView
+        android:id="@+id/page_info_cookie_controls_view"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_marginTop="16dp"
+        android:paddingStart="@dimen/page_info_popup_padding_sides"
+        android:paddingEnd="@dimen/page_info_popup_padding_sides"/>
+
     <View
         android:id="@+id/page_info_permissions_separator"
         android:layout_marginTop="16dp"
@@ -120,19 +133,6 @@
         android:paddingEnd="@dimen/page_info_popup_padding_sides" >
     </LinearLayout>
 
-    <View
-        android:id="@+id/page_info_cookie_controls_separator"
-        android:layout_marginTop="16dp"
-        style="@style/HorizontalDivider"/>
-
-    <org.chromium.components.page_info.CookieControlsView
-        android:id="@+id/page_info_cookie_controls_view"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:layout_marginTop="16dp"
-        android:paddingStart="@dimen/page_info_popup_padding_sides"
-        android:paddingEnd="@dimen/page_info_popup_padding_sides"/>
-
     <org.chromium.ui.widget.ButtonCompat
         android:id="@+id/page_info_site_settings_button"
         android:layout_width="wrap_content"