am 1c9fb40c: Merge change 6845 into donut

Merge commit '1c9fb40cb6dbfeee58c41a43852c5b94a1b83613'

* commit '1c9fb40cb6dbfeee58c41a43852c5b94a1b83613':
  Use MeasureSpec.getWidth instead of default display in lock pattern widget.