am 3f502de8: Make party shuffle use the history too, making it less random, but more like users expect. http://b/2535828

Merge commit '3f502de8e8963224054a97730d132f82ac87d522' into gingerbread-plus-aosp

* commit '3f502de8e8963224054a97730d132f82ac87d522':
  Make party shuffle use the history too, making it less random, but more like