am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary."...
am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev
* commit 'b524f4b9':
add some defensive code to enableUserSelectorIfNecessary.