Merge "Add Up button in Status settings"

am: aca67a3

* commit 'aca67a3c43e9a88cc9abff6a2db1ac9d21856b5c':
  Add Up button in Status settings

AndroidManifest.xml

@@ -1689,6 +1689,8 @@
         <activity android:name=".deviceinfo.Status"
                 android:label="@string/device_status_activity_title"
                 android:theme="@style/Theme.SubSettingsDialogWhenLarge"
+                android:taskAffinity="com.android.settings"
+                android:parentActivityName="Settings$DeviceInfoSettingsActivity"
                 android:process="com.android.phone">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />