Merge "fix sanitize soundtrigger hidl properties"