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

Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am: b6b4443d am: 74684f63 am: af5ce977 am: 7190597c am: 5de64b02  -s ours am: 2ed01f00  -s ours
am: 1ade78dc  -s ours

Change-Id: Iaee2ff65a346cc0f8aafc5c7bd07e6467fb791ed