Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev
am: b6b4443dbb

Change-Id: I1548fd726613cfc26f1e858b3190248cad00e5c8