Merge "Fix AudioManager.forceVolumeControlStream()" into jb-dev