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

Change-Id: Ibd1f49311e7315b67d361c1ac48bbb436e4cf1d7