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

Merge commit 'd1a3fc38e99e0483402168529020e758ecd777ce' into eclair-mr2-plus-aosp

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