Merge "Revert "MediaSession2 API set for audio focus handling""