Merge "SoundTriggerHelper: fix state after audioserver death" into qt-qpr1-dev
am: e5a3106cc5

Change-Id: I93be2df0ceb65fa2b78ea73d9d2cca679afd2f26