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

Change-Id: Ia824880f1020c46b30989325d154f88134cbdaed