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: eb4731a0 am: 76afce6f" into rvc-qpr-dev-plus-aosp am: 3ef1f5db

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

Change-Id: I135381f1ad8e138f42f03ef5a1b95fef2968d7d0