[automerger skipped] Merge "[DO NOT MERGE] Revert "Fixed the performance of...

[automerger skipped] Merge "[DO NOT MERGE] Revert "Fixed the performance of unlocking when dozing"" into sc-qpr1-dev am: f9d6fe21 -s ours am: 1b5cd8a3 -s ours am: 0f0ba4a5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I65448d0d9662057c8e435f222ec26de346b602a5