Merge "Soundtrigger service: fix cross deadlock with audio policy service am: 0957621867 am: 87da65273f  -s ours am: df5f9746f2  -s ours" into oc-mr1-dev-plus-aosp
am: 4a60f0509a  -s ours

Change-Id: I5cfeb79b3fec7683023a14773fb9191f7df3aab2