Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev