am 1b803450: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev

* commit '1b803450255ba1d4e173bd75d5cd9679c5a98915':
  Show the assist ring on center-button longpress on lockscreen.