Merge "Fix the regression that closing transition disappeared." into rvc-dev am: 76cfda57e5

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

Change-Id: Icfbdbcb10a02f29e195572a041d170f13c74bf5c