resolved conflicts for merge of c1244a29 to mnc-dr-dev

                result |= true; // we have a valid fingerprint

                mLockoutReset.run();

            }

            // For fingerprint devices that support touch-to-wake, this will ensure the device

            // wakes up and turns the screen on when fingerprint is authenticated.

            if (authenticated) {

                mPowerManager.wakeUp(SystemClock.uptimeMillis(),

                        "android.server.fingerprint:AUTH");

            }

            return result;

        }