Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev am:...
Merge "Don\'t call into audiomanager holding a zen lock." into nyc-dev am: d0f2d1f9 am: e042a3fe
am: 1cc79851
* commit '1cc79851':
Don't call into audiomanager holding a zen lock.
Change-Id: I957b7828215fe1f033ecb89de58fdbfb4a036a1d