Add --user to content commands

Bug: 267327327
Test: atest android.photopicker.cts.CloudPhotoPickerTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0be073e8676c27647d98e1b0f006a65cd57b26ed)
Merged-In: I0115329837dc91c8d684e324b8a6e2ad0d7e53a5
Change-Id: I0115329837dc91c8d684e324b8a6e2ad0d7e53a5

Author: Sahana Rao

tests/PhotoPicker/src/android/photopicker/cts/PhotoPickerBaseTest.java

@@ -20,6 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.os.UserHandle;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
@@ -86,11 +87,15 @@ static boolean isHardwareSupported() {
     protected static void setCloudProvider(@Nullable String authority) throws Exception {
         if (authority == null) {
             sDevice.executeShellCommand(
-                    "content call  --uri content://media/ --method set_cloud_provider --extra"
+                    "content call"
+                            + " --user " + UserHandle.myUserId()
+                            + " --uri content://media/ --method set_cloud_provider --extra"
                             + " cloud_provider:n:null");
         } else {
             sDevice.executeShellCommand(
-                    "content call  --uri content://media/ --method set_cloud_provider --extra"
+                    "content call"
+                            + " --user " + UserHandle.myUserId()
+                            + " --uri content://media/ --method set_cloud_provider --extra"
                             + " cloud_provider:s:"
                             + authority);
         }
@@ -99,7 +104,9 @@ protected static void setCloudProvider(@Nullable String authority) throws Except
     protected static String getCurrentCloudProvider() throws IOException {
         final String out =
                 sDevice.executeShellCommand(
-                        "content call  --uri content://media/ --method get_cloud_provider");
+                        "content call"
+                                + " --user " + UserHandle.myUserId()
+                                + " --uri content://media/ --method get_cloud_provider");
         return extractCloudProvider(out);
     }