am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev

* commit '1fa7384a101450c4619ed43e176d5a54aa0a54f3':
  Fix jank in wake-and-unlock while pulsing
  Don't call authenticate immediately after getting valid fingerprint