am 609bbf18: Merge change I54089080 into eclair

Merge commit '609bbf182e4b4f39b6be7ed01331887ca70ea4c1' into eclair-plus-aosp

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