am 89499268: Merge "Revert "Fix AudioManager.testRouting()."" into jb-dev

* commit '89499268e942d2450d77909af9979552a5099241':
  Revert "Fix AudioManager.testRouting()."