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
am: 0df59eb1e6  -s ours

Change-Id: I59fdc987f539018ed423bff8bf26c393e66f3340