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

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

Change-Id: I540554a4dc6d2c9b38c38d3ec9e727bfdd945333