Merge "Updating rotation transaction behaviour" into rvc-dev am: 7d42405b am: a82b55b4 am: 9154cc50

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

Change-Id: I0d00bd90aed30fbbdffaf53a24e5da9197200fdd