Merge "MediaSession2: Unhide setAudioFocusRequest"