Merge "MediaController2: Match APIs with MediaPlayerBase" into pi-dev