Merge "AudioManagerTest: modifications for fixed volume" into jb-mr2-dev