Merge "Apply rotation animation when canceling fixed rotation" into sc-dev am:...

Merge "Apply rotation animation when canceling fixed rotation" into sc-dev am: 25a8b5f6 am: 7f4fdd89 am: 470b7b5c

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

Change-Id: I12f4e4d33bb9a37952aee3f5e8aa4a584a79e473