Merge \"Move voice interaction callback list to VoiceInteractionManagerService\" into nyc-mr1-dev
am: b91a5e7431

Change-Id: I5fdf69335aaf3dd6ee77753b4f3cc554e1a0342c