Merge "Updating rotation transaction behaviour" into rvc-dev am: 7d42405b am: 961e365b

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

Change-Id: I2f5dd9d7219afd81a2d561babf2e53c87e854cfc