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

Change-Id: If398ae680d0e7fd71a10894d3609fabdff700cc2