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

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