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