Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev