Merge "Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a am: eb4731a06c am: 76afce6ff0" into rvc-qpr-dev-plus-aosp am: 3ef1f5dbd6

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

Change-Id: I135381f1ad8e138f42f03ef5a1b95fef2968d7d0