am c2230a9d: am ef417bb7: am 6a64a9cd: Merge "Prevent AudioService dead lock issue."

* commit 'c2230a9d1a7bba12b78630a0dfbad7be5c97050f':
  Prevent AudioService dead lock issue.