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 am: 0e00683b

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

Change-Id: I528129f6b3ba7d00e4f90d4e1622b88e44c6da20