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

Change-Id: I809b459045a0606abc6ea5d4ad2d186f752b8bfb