Merge "Merge "Soundtrigger service: fix cross deadlock with audio policy...

Merge "Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am: 1a721bb6  -s ours am: 5a1dae0c  -s ours am: fa5253c8  -s ours am: 021923a3  -s ours am: c798254f  -s ours am: 37e80117  -s ours am: 63b868e2  -s ours am: 68d7af91  -s ours am: 4efb8774  -s ours am: 94a417ca  -s ours am: 8fc33c4f  -s ours am: ec248b8d  -s ours am: 83342416  -s ours am: 20ddd7f5  -s ours" into oc-mr1-dev-plus-aosp
am: 73a3fba4  -s ours

Change-Id: I607428e66174b562e3d272b71ea8e7b77c3f0d01