Merge "Fix deadlock between audio policy manager and sound trigger m/w" into rvc-dev am: 29827d592a am: c4f7b64460 am: 8f98cb0852 am: 745479beba

Change-Id: I1bb7ffe86cfe6caa2091ee176d02f68cd862157e