am 03bd101b: Merge "Move lockscreen to using haptic feedback setting." into jb-mr1-dev

* commit '03bd101b887d9741230ac6a7d296d90436020b8c':
  Move lockscreen to using haptic feedback setting.