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

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

Change-Id: I0f340ef1054942811aed4abecf86272fec7f074d