Merge "MediaControlIntent: Rename constants and methods" into nyc-dev