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

Change-Id: I2ce7a68a08537815d93917a71f6a99a827b59d61