[automerger skipped] Merge "Fixed the performance of unlocking when dozing" into sc-qpr1-dev am: 3e4737aafa am: 8c1b5aaeb7 -s ours am: 787a43c45e -s ours
am skip reason: Merged-In Iebefca3a1810a498654cad0e461532a5d9f7d0af with SHA-1 4e0c250564 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16024420
Change-Id: Id1aa55ee644cf174883009f8de4d5b30e8fbe226
This commit is contained in: