Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev

automerge: ad44f74

* commit 'ad44f7448f0b9aa672cad21300f436e369c8105d':
  Never set "Work" or "Personal apps" as prefered activities.

core/java/com/android/internal/app/ResolverActivity.java

@@ -343,7 +343,7 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic
                     }
 
                     final Intent intent = intentForDisplayResolveInfo(dri);
-                    onIntentSelected(dri.ri, intent, mAlwaysUseOption);
+                    onIntentSelected(dri.ri, intent, false);
                     finish();
                 }
             });