am 38515e9a: am c8ed8d32: Merge "Adding user activity when the challenge is slid down" into jb-mr1-lockscreen-dev

* commit '38515e9a4c4c5db5045b873842df594f50b12421':
  Adding user activity when the challenge is slid down