Merge "Cancel the recents animation when keyguard is occluding.[1/2]" into...

Merge "Cancel the recents animation when keyguard is occluding.[1/2]" into tm-qpr-dev am: b1f4e4cf

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



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