Merge "Only apply crop to task and task fragment in end transition" into...

Merge "Only apply crop to task and task fragment in end transition" into tm-qpr-dev am: 0e8f4211 am: 04e8b101

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



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