Merge "VoiceInteractionManagerService: userId vs. uid"