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

Change-Id: I5471dae8cdbd105f8f76e8c7fd3bcb1f9cc847a8