Merge "Merge "Reinitialize voice interaction service on unlock" into nyc-dev am: ea61e63b am: 9db92ccd" into nyc-mr1-dev-plus-aosp