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

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

Change-Id: Ife33a3e4a44a671f8060146b91c824eb703c8e4d