(SHIFT) device info: reorganize

Change-Id: I7c84edaead77b83b4d2f5d6090fb3cc0b2171509
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 7a615b8..e85615a 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -94,17 +94,18 @@
         <!-- SIM status -->
         <Preference
             android:key="sim_status"
-            android:order="18"
+            android:order="42"
             android:title="@string/sim_status_title"
             settings:keywords="@string/keywords_sim_status"
             android:summary="@string/summary_placeholder"
+            settings:allowDividerAbove="true"
             settings:isPreferenceVisible="@bool/config_show_sim_info"
             settings:enableCopying="true"/>
 
         <!-- Model & hardware -->
         <Preference
             android:key="device_model"
-            android:order="31"
+            android:order="18"
             android:title="@string/model_info"
             android:summary="@string/summary_placeholder"
             android:fragment="com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFragment"
@@ -115,7 +116,7 @@
         <!-- IMEI -->
         <com.android.settings.deviceinfo.PhoneNumberSummaryPreference
             android:key="imei_info"
-            android:order="32"
+            android:order="43"
             android:title="@string/status_imei"
             android:summary="@string/summary_placeholder"
             settings:keywords="@string/keywords_imei_info"
@@ -126,7 +127,7 @@
         <!-- Android version -->
         <Preference
             android:key="firmware_version"
-            android:order="42"
+            android:order="31"
             android:title="@string/firmware_version"
             android:summary="@string/summary_placeholder"
             android:fragment="com.android.settings.deviceinfo.firmwareversion.FirmwareVersionSettings"
@@ -135,7 +136,7 @@
         <!-- ShiftOS version -->
         <Preference
             android:key="shiftos_version"
-            android:order="43"
+            android:order="32"
             android:title="@string/shiftos_version"
             android:summary="@string/summary_placeholder"
             android:selectable="false"
@@ -188,7 +189,8 @@
             android:order="48"
             android:title="@string/status_up_time"
             android:summary="@string/summary_placeholder"
-            android:selectable="false"/>
+            android:selectable="false"
+            settings:allowDividerAbove="true"/>
 
         <!-- Manual -->
         <Preference