Merge "Merge "SoundTrigger Event logging" into qt-dev am: 9741940810" into qt-dev-plus-aosp