Merge "Preempt recents animation if display is changed" into udc-dev am: fe69fc42 am: 8b3cb4cf

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



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