Merge "Adapt AudioManager volume test to new behavior" into ics-mr0