[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 am: 5ba14c14 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib41bc5d9ba9f967f4240d6b4589a0269fa1d2770