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 am: c798254fba  -s ours am: 37e801176e  -s ours am: 63b868e27b  -s ours
am: 68d7af9137  -s ours

Change-Id: I383dd11b76524bb9e1c3bde8d27429a0ddff5cce