am b46857d2: am b1f45c4a: am c3eb57b2: Merge "AudioService: improve initial safe volume delay" into jb-mr1.1-dev

* commit 'b46857d228edc53878e738ffd484dea1acf44baf':
  AudioService: improve initial safe volume delay