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

* commit 'e9b7d6982a9214c0158c7b0ac51d441c41cc4334':

Change-Id: I870eb80b69e45f491dbe8cad8c1e15ffdd13cb4e