Merge "Fix the regression that closing transition disappeared." into rvc-dev...

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

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

Change-Id: Icc99b00c3b0735ad0650b17d6ac2050a53679a0d