Merge "MediaSessionCompat: Set default callback to pass extra binder"