am 930055d1: Merge "Add Lollipop+ playback states to PlaybackStateCompat" into lmp-mr1-ub-dev

* commit '930055d119aad484386bac603ffa9f2e12260109':
  Add Lollipop+ playback states to PlaybackStateCompat