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
am: 021923a373  -s ours

Change-Id: I5a09210ea4c9cc0a602dbcefecfa4b7b41dc9ea8