Merge "Don\'t bind ChooserTargetServices as user CURRENT" into nyc-dev

am: 0cc531a

* commit '0cc531ae31e1bb13ecca2cdcd8ddb296542362e0':
  Don't bind ChooserTargetServices as user CURRENT

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

@@ -433,8 +433,7 @@ public class ChooserActivity extends ResolverActivity {
 
                 final ChooserTargetServiceConnection conn =
                         new ChooserTargetServiceConnection(this, dri);
-                if (bindServiceAsUser(serviceIntent, conn, BIND_AUTO_CREATE | BIND_NOT_FOREGROUND,
-                        UserHandle.CURRENT)) {
+                if (bindService(serviceIntent, conn, BIND_AUTO_CREATE | BIND_NOT_FOREGROUND)) {
                     if (DEBUG) {
                         Log.d(TAG, "Binding service connection for target " + dri
                                 + " intent " + serviceIntent);