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

Change-Id: I325b9ad452b2ee6da8368ad5951fc37cad80723f