DO NOT MERGE: Fix AudioManagerTest#testVolume.

This CL combines ag/584213 and ag/611137, thus avoiding
merge-conflict.

Change-Id: I1ad34ed5c2b0a1b8a9a6a126554bbdf492a9f705
1 file changed