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

Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a346874 am: 9b5948f6 am: 0e00683b" into rvc-qpr-dev-plus-aosp am: f6cfb1b5

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

Change-Id: I8268252e7162fb2d9a969378cd47ef50c3950982