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

* commit '89be4267d0a23ca258af607291bc4f905f963185':
  Move lockscreen to using haptic feedback setting.