Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev