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

Change-Id: Ia369a5f5dc1ae89f651d4db92d134fda4bb62966