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: ab48098b am: 3aca6c35

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

Change-Id: I1bbfcce0603572b17f0f88031fbb2e8419d56a0a