Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev

* changes:
  Add extras to the PlaybackState
  Add setRatingType to MediaSession