Merge "Finish fixed rotation while the task has done transition" into rvc-dev am: 1a3468740a

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

Change-Id: I52e62f2f07a12982016db3ae2b62eb19172b293f