Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev
am: c92f8b4053

Change-Id: If507935451775e59e30465a48df8f6c5dc0a8050