Merge "Revert "Make AudioManager.generateAudioSessionId() static""