Merge "Merge "Fix the regression that closing transition disappeared." into rvc-dev am: 76cfda57 am: 13d62301 am: c50d389e" into rvc-qpr-dev-plus-aosp am: 5c90a266

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

Change-Id: I93e6f17e767d5dad5cd25c11a232dea9f48b96f2