Merge \"Merge \\\"MediaPlayer: fix state for setPlaybackParams.\\\" into...
Merge \"Merge \\\"MediaPlayer: fix state for setPlaybackParams.\\\" into nyc-dev am: d554814b am: 1978994a\" into nyc-mr1-dev-plus-aosp
am: ad3022f7
Change-Id: Ib7852f9a610c0738cfb3133613dd9bf591f8f868