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

Change-Id: Idf697e91336a76a62e96a332976998a4a4f6d8e0