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

Change-Id: Id35d069b64aaf629ac1e023e7f5f975f4b2a6fb6