Merge "Fix wakeAndUnlock immediately after sleep." into tm-dev am: bbc60f7400

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17982124

Change-Id: Ic94d14140f76e1f59aee92c5a5d7c0c8701bed77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

@@ -4456,6 +4456,13 @@ public class CentralSurfacesImpl extends CoreStartable implements
                     updateDozingState();
                     mDozeServiceHost.updateDozing();
                     updateScrimController();
+
+                    if (mBiometricUnlockController.isWakeAndUnlock()) {
+                        // Usually doze changes are to/from lockscreen/AOD, but if we're wake and
+                        // unlocking we should hide the keyguard ASAP if necessary.
+                        updateIsKeyguard();
+                    }
+
                     updateReportRejectedTouchVisibility();
                     Trace.endSection();
                 }