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 am: c75c947a  -s ours am: 849a10fc  -s ours
am: faee2cdf  -s ours

Change-Id: I44a1b689d2b395e477b5b9e145228e31ebf8b870