Merge "MediaSession2: Unhide setAudioFocusRequest"

diff --cc api/current.txt
index a82ca6a,0fab5e1..19c3b69
--- 1/api/current.txt
--- 2/api/current.txt
+++ b/api/current.txt
@@@ -24830,8 -24814,10 +24830,9 @@@ package android.media 
      method public void sendCustomCommand(android.media.MediaSession2.Command, android.os.Bundle);
      method public void sendCustomCommand(android.media.MediaSession2.ControllerInfo, android.media.MediaSession2.Command, android.os.Bundle, android.os.ResultReceiver);
      method public void setAllowedCommands(android.media.MediaSession2.ControllerInfo, android.media.MediaSession2.CommandGroup);
+     method public void setAudioFocusRequest(android.media.AudioFocusRequest);
      method public void setCustomLayout(android.media.MediaSession2.ControllerInfo, java.util.List<android.media.MediaSession2.CommandButton>);
 -    method public void setPlayer(android.media.MediaPlayerBase);
 -    method public void setPlayer(android.media.MediaPlayerBase, android.media.VolumeProvider2);
 +    method public void setPlaybackSpeed(float);
      method public void setPlaylist(java.util.List<android.media.MediaItem2>);
      method public void setPlaylistParams(android.media.MediaSession2.PlaylistParams);
      method public void skipToNext();

diff --cc media/java/android/media/MediaSession2.java
Simple merge