Merge "Add Lollipop+ playback states to PlaybackStateCompat" into lmp-mr1-ub-dev