am 09904d84: am d1a3fc38: am 609bbf18: Merge change I54089080 into eclair

Merge commit '09904d84d10c5b3345c2594e9fe3ec275a4f3a69'

* commit '09904d84d10c5b3345c2594e9fe3ec275a4f3a69':
  Update keyguard and pattern-lock layouts for new UX designs.