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

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



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