Merge "Reset crop after finished transition" into tm-dev am: 02853a7a

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



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