Merge "Revert "Add additional context to MtpDatabase"" into pi-dev

am: 02a005703a

Change-Id: Id1667df7f50096619e7207d42a0212139eab7758

media/java/android/mtp/MtpDatabase.java

@@ -243,11 +243,11 @@ public class MtpDatabase implements AutoCloseable {
         }
     };
 
-    public MtpDatabase(Context context, Context userContext, String volumeName,
+    public MtpDatabase(Context context, String volumeName,
             String[] subDirectories) {
         native_setup();
         mContext = context;
-        mMediaProvider = userContext.getContentResolver()
+        mMediaProvider = context.getContentResolver()
                 .acquireContentProviderClient(MediaStore.AUTHORITY);
         mVolumeName = volumeName;
         mObjectsUri = Files.getMtpObjectsUri(volumeName);