am 946f6ab4: am 9819a617: Merge "Fix password field focus in keyguard" into jb-mr1.1-dev

* commit '946f6ab44048138c03f9bcf93451322b4397f8f9':
  Fix password field focus in keyguard