Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev

am: df66d4abf0

* commit 'df66d4abf0c994b5f53ec0978ba97e746852e3e9':
  Start DeviceAdminSettings in a new task from support dialog.

Change-Id: I6a249b3e238f0ab8336e1a6d81bf77d7b2d3a11d

src/com/android/settings/ShowAdminSupportDetailsDialog.java

@@ -161,6 +161,7 @@ public class ShowAdminSupportDetailsDialog extends Activity
                                     new UserHandle(enforcedAdmin.userId));
                         } else {
                             intent.setClass(activity, Settings.DeviceAdminSettingsActivity.class);
+                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                             // Activity merges both managed profile and parent users
                             // admins so show as same user as this activity.
                             activity.startActivity(intent);