Merge "Fix transition offset when closing with reparent" into udc-dev am: 48733cf1 am: 7ab05d14 am: 3997a7c0 am: 58c578e2

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



Change-Id: Ic707a41b4117f654d7bb76e3d5b34ff39009e9f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>