Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev
am: 192e7ccf45

Change-Id: I22f3e2968a724bd6c63b5f9696d1115d571efaf8