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 am: 2ed01f0006  -s ours am: 1ade78dc5d  -s ours
am: c75c947a42  -s ours

Change-Id: Idb5cc2015cca47cad52cd93b472913d532bdf6ba