Merge "Merge \\"MediaPlayer: fix java doc for setPlaybackParams.\\" into nyc-dev am: bd45be5032 am: 24ac2ece50" into nyc-mr1-dev-plus-aosp