Merge "Keyguard should wait before restarting FP auth after successful FP...
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev am: 192e7ccf
am: e54f5bac
Change-Id: I31c34152803581cddcaadd58d67ff4e7d821a3e1