Merge "Make Trusted Hotword session permissions follow previous behavior" into sc-dev