Merge "sdm845: Update sound trigger HIDL version to 2.1"