Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb
am: 7f0263ba2d

Change-Id: I1777f119f17e359bead997c1bd043e1554c5125c