Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: eb4731a06c

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

Change-Id: I6ddc788590ab317277767908b9addfa2c27b2051