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

Change-Id: Ie5d8451abfc732b45b9d803a6a901313479c0aa3