Merge "When the user changes the OP_RECEIVE_SANDBOX_TRIGGER_AUDIO op mode to...

Merge "When the user changes the OP_RECEIVE_SANDBOX_TRIGGER_AUDIO op mode to MODE_ERRORED via UI toggle, the following actions will be taken to prevent the assistant app from being voice-activated:" into main