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

* commit '6a64a9cd26cb8096f1ea67f7c7eee788370752b0':
  Prevent AudioService dead lock issue.