Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am: 1a721bb633  -s ours am: 5a1dae0cea  -s ours
am: fa5253c8bc  -s ours

Change-Id: I81fd60488c379d4aed791d2a1c6f2f99c8f51585