Address API council feedback on MediaBrowserCompat/MediaSessionCompat
am: e48441650b

Change-Id: I270251c460295fe1f2cce5f05d4de0ec18308945