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: 9b5948f6

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

Change-Id: I3f2c2137d07f0a803875653fc69fcc2a3255a395