Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev