Merge "Fix issues with landscape transition" into rvc-dev am: f769298b am:...

Merge "Fix issues with landscape transition" into rvc-dev am: f769298b am: 7ea15867 am: d0e74868 am: 3e401ce4

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

Change-Id: Ieb39bf1750345f1c9776e9c9f2bcbf0e13d065a9