Merge "Merge "Keyguard should wait before restarting FP auth after successful...
Merge "Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev am: 192e7ccf am: af35c768" into oc-mr1-dev-plus-aosp
am: a97779fc
Change-Id: I8dae85af4ddb9beb449c94abb8f412d997f6d6bf