Merge "Fix AudioManagerTest.testVolume()" into jb-dev