[automerger skipped] Merge "Fixed the performance of unlocking when dozing"...

[automerger skipped] Merge "Fixed the performance of unlocking when dozing" into sc-qpr1-dev am: 3e4737aa -s ours am: edb518fe -s ours

am skip reason: Merged-In Iebefca3a1810a498654cad0e461532a5d9f7d0af with SHA-1 4e0c2505 is already in history

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

Change-Id: I60e51784ab969e07d64fcba1b52994de76a63bf6