Merge "Fix transition offset when closing with reparent" into udc-dev am:...

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

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



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