am 1917d96b: am f9882022: Merge "More AudioManager.generateAudioSessionId() javadoc" into lmp-dev

* commit '1917d96b04d910027a90023d986130548a4f7ab1':
  More AudioManager.generateAudioSessionId() javadoc