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

[automerger skipped] [DO NOT MERGE] Revert "Fixed the performance of unlocking when dozing" am: d4a2e7c9 am: 2df31a11 -s ours am: 9089b136 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib5c9274413608df247f3453fdba58fc2b6c17248