Merge "MediaController2: Rename onAudioInfoChanged"