am 22254f50: am 39f6be12: Merge "More fixes for keyguard animations." into lmp-mr1-dev automerge: 7b1b0f6

* commit '22254f504f10a0190792060de2820ccf7323a84f':
  More fixes for keyguard animations.