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

Change-Id: I7369c6ca2c81c9aaaadf6719e5fc5cb86eb4d033