Merge "Improved implementation of VoiceInteractionManagerService.setDisabled()" into sc-dev