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

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



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