Merge "Move voice interaction callback list to VoiceInteractionManagerService" into nyc-mr1-dev