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

[automerger skipped] Merge "Revert "Fixes cannot leave dozing when dismiss keyguard"" into sc-v2-dev am: 652e10d6 -s ours am: 27873596 -s ours

am skip reason: Merged-In I4edab8588421b3e341cf3bde07e989ff5e651cfe with SHA-1 0063c248 is already in history

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

Change-Id: Iae4dc3b2bb7f13d708abe91488a17a83b6dddcb2