Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev