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: 13d62301

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

Change-Id: I60023d5331b24cf39035b3a6573045f5e64489ca