Merge "Finish fixed rotation while the task has done transition" into rvc-dev...

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

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

Change-Id: Ic3958ac075e04c7fe027fd0f3bbd55d76fed0cfe