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

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

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



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