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" into rvc-d1-dev-plus-aosp am: b45df911

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

Change-Id: If6b6eb5e5a0ea68962223712318ed92168526b55