Merge change 24512 into eclair

* changes:
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.