Merge "Update VoiceInteractionService from API review." into mnc-dev