[automerger skipped] [automerge] Revert "Fixes cannot leave dozing when...

[automerger skipped] [automerge] Revert "Fixes cannot leave dozing when dismiss keyguard" 2p: 0063c248 am: ac41cf4f -s ours am: 594fc9d6 -s ours

am skip reason: Merged-In I4edab8588421b3e341cf3bde07e989ff5e651cfe with SHA-1 19660ca3 is already in history

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

Change-Id: I69069a6d7d9cd1b7ac42820333fe2142a922d0d4