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

Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139

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

@@ -576,12 +576,6 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
                 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;
         }