Merge "Do not skip wake-and-unlock animation" into tm-qpr-dev am: 196a91a4

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



Change-Id: I3ac1c35c839cfc2f87702979f6b77c21fe3e3696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>