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

Merge "Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a346874 am: eb4731a0" into rvc-d1-dev-plus-aosp am: b45df911" into rvc-qpr-dev-plus-aosp am: 0b2e8889

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

Change-Id: I1c9f8b5aff12b8646c23ffcaed0679a26e2529a0