Merge "Avoid deadlock on soundtrigger HAL death" into rvc-dev am: 5c5a830c9a am: 66881d4e17

Change-Id: Iecd0975e31fd9d83cafb915fbe7b6ebdaa80ddcf