Merge "Soundtrigger service: fix cross deadlock with audio policy service"...

Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95 am: 7f0263ba am: 31ac3bd1 am: 830bbb25 am: 960f0f33  -s ours am: 1fd129f4  -s ours am: a5d92415  -s ours
am: b313fcad  -s ours

Change-Id: I7083ee97975caf1c54bb66ed8210578e0491742b