am e2b8dab0: am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev

* commit 'e2b8dab0d0f541e4a014536f8088ac51afc06c49':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession