Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e  -s ours am: 1fd129f457  -s ours
am: a5d924154e  -s ours

Change-Id: I1810d2f976168e3b32bbdc16726cd73182f979ed