Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am: b6b4443dbb am: 74684f638b am: af5ce97781 am: 7190597c26
am: 5de64b02a3  -s ours

Change-Id: Ic1e0b59044e2b56b051edf9987acb99357d4dab8