Merge "Use current rotation for snapshot of canceling fixed rotation" into...

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

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

Change-Id: Ie2857b186d61927f95a50fe2b930457a308b0fc5