Merge "Fix shared transition offsets in landscape" into sc-dev am: 3196d0fa...

Merge "Fix shared transition offsets in landscape" into sc-dev am: 3196d0fa am: 5ad849a9 am: 8c00b885

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

Change-Id: Ibc8689483c3f0458f77c0bbd6475bea28c595ca7