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

Merge "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: 0df59eb1  -s ours" into oc-mr1-dev-plus-aosp
am: b013b151  -s ours

Change-Id: I26fb9db87c8c6980a802b24c5cefdbc140a8b1a1