Merge "Adding getModelState to soundtrigger with build fix. original cl was ag/4879522"