Merge "Revert "Fixed the performance of unlocking when dozing"" into sc-v2-dev am: 2ffe5969

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

Change-Id: I9d330db3654a85aa4b29c519e688b4e3b779ef9b