Merge "Apply rotation animation when canceling fixed rotation" into sc-dev am: 25a8b5f6 am: 2ff7d5d5 am: 7b95fc91

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

Change-Id: Ic3fe275a2ee0a7d899e87bb271a054bfe16a6aeb