Merge "Fix the build" into mnc-dr-dev

services/core/java/com/android/server/fingerprint/FingerprintService.java

@@ -563,7 +563,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
             }
             // 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 (mIsKeyguard && authenticated) {
+            if (authenticated) {
                 mPowerManager.wakeUp(SystemClock.uptimeMillis(),
                         "android.server.fingerprint:AUTH");
             }