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

Merge "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 am: c75c947a  -s ours am: 849a10fc  -s ours am: faee2cdf  -s ours am: 836b7133  -s ours am: 24e67996  -s ours am: 92d161a2  -s ours" into oc-mr1-dev-plus-aosp
am: 59a5890a  -s ours

Change-Id: Ib8da31b8373ba8aa5da85ce93100479afd3afca6