Merge "Use current rotation for snapshot of canceling fixed rotation" into sc-dev am: c63b6d1b

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

Change-Id: Ibf7d46ce2b57174ad3a7e53ec1f8b7f582c87094