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

Change-Id: I1cb6bfc9221a5e095b4aa9db8745fdf183a8ddbf