Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev
am: d0f2d1f9ac

* commit 'd0f2d1f9ace01c4e0581baa3f5eb0a694afca675':
  Don't call into audiomanager holding a zen lock.

Change-Id: I8a7eee3478bca5d8bfd1262e68d136b58fda4884