Removing settings from task stack if called from launcher

Bug: 3360814
Change-Id: I9c68fbb5894c207259c2cdd055d6bb97c129199c
diff --git a/src/com/android/contacts/activities/ContactBrowserActivity.java b/src/com/android/contacts/activities/ContactBrowserActivity.java
index ea7fffe..9336f75 100644
--- a/src/com/android/contacts/activities/ContactBrowserActivity.java
+++ b/src/com/android/contacts/activities/ContactBrowserActivity.java
@@ -568,6 +568,7 @@
         @Override
         public void onAddAccountAction() {
             Intent intent = new Intent(Settings.ACTION_ADD_ACCOUNT);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
             intent.putExtra(Settings.EXTRA_AUTHORITIES,
                     new String[] { ContactsContract.AUTHORITY });
             startActivity(intent);
@@ -750,6 +751,7 @@
                 intent.putExtra(Settings.EXTRA_AUTHORITIES, new String[] {
                     ContactsContract.AUTHORITY
                 });
+                intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
                 startActivity(intent);
                 return true;
             }