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

Change-Id: I5c11295c9b097f8d359f221023e1bb1a03b7cb8f