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

Change-Id: I9e99134af75cc2f03eaec7e8686ee1ab04c678ed