am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password...
am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev
* commit '54ceea19':
Poke fingerprint timeout when vold password is correct