Merge "Add sound trigger control by audio policy" into lmp-dev