Merge "Send USER_PRESENT for keyguard choice "None"" into jb-mr1-dev