Merge \"Add callbacks to VoiceInteractionManagerService\" into nyc-mr1-dev
am: d58f07f58a

Change-Id: I6a9c537b71084696915e744102a6a12f532942d5