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

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

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

Change-Id: Ib6b2f5c3d8b146dce456a0df39aae3126f0d6a3c