Merge "SystemUI/Keyguard: try authenticate finger after authentication failure" into mnc-dev