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

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