Merge "Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: eb4731a06c" into rvc-d1-dev-plus-aosp am: b45df911a7" into rvc-qpr-dev-plus-aosp am: 0b2e88890a

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

Change-Id: I1c9f8b5aff12b8646c23ffcaed0679a26e2529a0