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
am: 8ac83c37  -s ours

Change-Id: I79a963228984e606aa8f9f306af4bda8435ed741