Merge "MediaBrowser: Copy options before using it in subscribe()" into nyc-dev

am: e10739ab8b

* commit 'e10739ab8ba6dac48cdb53ec82586be3cf312255':
  MediaBrowser: Copy options before using it in subscribe()

media/java/android/media/browse/MediaBrowser.java

@@ -1116,7 +1116,7 @@ public final class MediaBrowser {
                 }
             }
             mCallbacks.add(callback);
-            mOptionsList.add(options);
+            mOptionsList.add(options == null ? null : new Bundle(options));
         }
 
         public boolean removeCallback(Bundle options) {