am 42517367: Merge "Update keyguard layouts on phone" into jb-mr1-dev

* commit '42517367947047dd6cf7bd014e0c6d2db030af4e':
  Update keyguard layouts on phone