am 3f5e4588: Merge "Adapt AudioManager volume test to new behavior" into ics-mr0

* commit '3f5e45884a66f9a3b218ba11ea793164b5e3e18b':
  Adapt AudioManager volume test to new behavior