[automerger skipped] Merge "Revert "Fix shared transition offsets in...

[automerger skipped] Merge "Revert "Fix shared transition offsets in landscape"" into sc-v2-dev am: 648874c4 am: e57570bd -s ours

am skip reason: Merged-In I47dedda772d4b62dbf134f9ea5cc9293b27cb277 with SHA-1 c356ad4c is already in history

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

Change-Id: I716379c53a81d77ad529f52564b65ec8afc5186a